Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Social: Fix share modal trigger presence #39135

Merged
merged 3 commits into from
Aug 30, 2024
Merged

Social: Fix share modal trigger presence #39135

merged 3 commits into from
Aug 30, 2024

Conversation

gmjuhasz
Copy link
Contributor

Fixes https://github.com/Automattic/jetpack-reach/issues/553

Proposed changes:

  • Only show the modal trigger if shareStatus.shares is present and length is not 0.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

https://github.com/Automattic/jetpack-reach/issues/553

Does this pull request change what data or activity we track or use?

No.

Testing instructions:

  • Publish a post without sharing.
  • It should not have the modal trigger. Refresh, still should not have the trigger
  • Publish a post with sharing, it should have the modal trigger.
  • Open an already published post, it should have the modal trigger

@gmjuhasz gmjuhasz requested a review from a team August 29, 2024 10:54
@gmjuhasz gmjuhasz self-assigned this Aug 29, 2024
@github-actions GitHub Actions
Copy link
Contributor

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 29, 2024 •
edited
Loading

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the fix/social-share-modal-trigger-presence branch.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack fix/social-share-modal-trigger-presence

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

manzoorwanijk
manzoorwanijk previously approved these changes Aug 29, 2024
View reviewed changes
Copy link
Member

@manzoorwanijk manzoorwanijk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works well.

@manzoorwanijk manzoorwanijk dismissed their stale review August 30, 2024 05:10

Need to test the failed share case in post publish panel

@gmjuhasz gmjuhasz merged commit b136156 into trunk Aug 30, 2024
59 checks passed
@gmjuhasz gmjuhasz deleted the fix/social-share-modal-trigger-presence branch August 30, 2024 07:58
manzoorwanijk
manzoorwanijk reviewed Sep 2, 2024
View reviewed changes
projects/js-packages/publicize-components/src/components/share-status/modal-trigger.tsx
const featureFlags = useSelect( select => select( socialStore ).featureFlags(), [] );
const shareStatus = useSelect( select => select( socialStore ).getPostShareStatus(), [] );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to check for feature flag here

const shareStatus = useSelect(
	select => {
		return featureFlags.useShareStatus
			? select( socialStore ).getPostShareStatus()
			: { shares: [] };
	},
	[ featureFlags.useShareStatus ]
);

// If the post is not shared anywhere, thus there are no shares, we don't need to show the trigger.
if ( ! featureFlags.useShareStatus || ! shareStatus.shares.length ) {
	return null;
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we do that here, or inside the getPostShareStatus resolver?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we could do something like

		const featureFlags = registry.select( socialStore ).featureFlags();

		if ( ! featureFlags.useShareStatus ) {
			dispatch( fetchPostShareStatus( postId, false ) );
			return;
		}

into getPostShareStatus in projects/js-packages/publicize-components/src/social-store/resolvers.js so it's checked wherever its called

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had thought the same but it's better to keep the resolver clean.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or may be it's fine to do that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that's true, but then we have to do that logic you mentioned everywhere 🤔 I'm not sure which one is better, I thought in the resolver it's less places to do

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, let us go with the resolver approach to do an early return based on feature flag

gogdzl pushed a commit that referenced this pull request Oct 25, 2024
@gmjuhasz @gogdzl
Social: Fix share modal trigger presence (#39135)
053d996 
* Only show modal trigger if there are shares for the post

* changelog

* Use only socialStore
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@manzoorwanijk manzoorwanijk manzoorwanijk approved these changes

Assignees

@gmjuhasz gmjuhasz

Labels
[JS Package] Publicize Components RNA
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gmjuhasz @manzoorwanijk